Skip to content

Conversation

lukeina2z
Copy link
Contributor

@lukeina2z lukeina2z commented Jul 3, 2025

This change merges all private Lambda Java updates from the v1.33 branch into the main branch.

Those changes have been merged into release branch v2.11.x with following PR. This PR does the similar thing which back port those changes to the main branch.

[Lambda Java v2.11.x] Merge All Code Changes from v1.33.x Branch into v2.11.x #1114
#1114

I performed a 'git rebase main' on the v1.33 branch, reviewed all changes, and completed the build and testing process. The resulting Lambda layer generated trace data identical to the version built directly from the main branch (excluding this PR).

Note: The changes in the patch files are not included in this PR. They should have been reviewed and incorporated as part of this migration:

Upgrade Java Lambda Layer to 2.x #1076
#1076

Issue #, if available:

Description of changes:

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@lukeina2z lukeina2z requested a review from a team as a code owner July 3, 2025 19:08
@lukeina2z lukeina2z force-pushed the try-merge-with-main-pr branch from b8967ad to bb1afc5 Compare July 3, 2025 19:45
@lukeina2z lukeina2z force-pushed the try-merge-with-main-pr branch from bb1afc5 to 96c3188 Compare August 19, 2025 19:59
This change merges all private Lambda Java updates from the v1.33 branch into the main branch.

I performed a 'git rebase main' on the v1.33 branch, reviewed all changes, and completed the build and testing process. The resulting Lambda layer generated trace data identical to the version built directly from the main branch (excluding this PR).

Note: The changes in the patch files are not included in this PR. They should have been reviewed and incorporated as part of this migration:

Upgrade Java Lambda Layer to 2.x aws-observability#1076
aws-observability#1076
@lukeina2z lukeina2z force-pushed the try-merge-with-main-pr branch from 96c3188 to c67a62d Compare August 20, 2025 14:48
@codecov-commenter
Copy link

codecov-commenter commented Aug 20, 2025

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

❌ Patch coverage is 49.01961% with 26 lines in your changes missing coverage. Please review.
✅ Project coverage is 67.45%. Comparing base (09e6487) to head (b249c88).
⚠️ Report is 470 commits behind head on main.

Files with missing lines Patch % Lines
...iders/AwsApplicationSignalsCustomizerProvider.java 0.00% 15 Missing and 1 partial ⚠️
...try/javaagent/providers/AwsSpanProcessingUtil.java 70.00% 1 Missing and 5 partials ⚠️
...ry/javaagent/providers/AwsLambdaSpanProcessor.java 69.23% 3 Missing and 1 partial ⚠️
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.
Additional details and impacted files
@@              Coverage Diff              @@
##               main    #1112       +/-   ##
=============================================
- Coverage     85.71%   67.45%   -18.26%     
- Complexity       19      521      +502     
=============================================
  Files             3       54       +51     
  Lines            49     2649     +2600     
  Branches          5      368      +363     
=============================================
+ Hits             42     1787     +1745     
- Misses            3      729      +726     
- Partials          4      133      +129     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@srprash
Copy link
Contributor

srprash commented Aug 20, 2025

I performed a 'git rebase main' on the v1.33 branch, reviewed all changes, and completed the build and testing process.

Can you describe in more details how were these changes tested? What tests were run as part of your testing?
Overall the PR looks good to me as long as there are no regressions. :)

@lukeina2z
Copy link
Contributor Author

#1114

Sure. The test is exactly the same as the one I did in this PR: #1114
. The screenshots there help illustrate the testing work.

This PR does the same thing as #1114: moving the same piece of code from 1.33 to the v2 branch.

@lukeina2z lukeina2z merged commit 6d9b13a into aws-observability:main Aug 20, 2025
5 checks passed
@lukeina2z lukeina2z deleted the try-merge-with-main-pr branch August 22, 2025 23:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants